[coastguard skipped] Merge sparse cherrypicks from sparse-12859739-L47100030009309150 into udc-platform-release. COASTGUARD_SKIP: Icbbbe3426d1b6847f46126ebbc88962aa776dac6 COASTGUARD_SKIP: Ie5462b099bf3ba080df6c6b0e462cb33d3f2be1d Change-Id: I5a4a00c3c40efc6d8b7b4859e75e2f2f15f1f60f